Move GtkBoxChild from the public .h to gtkbox.c

https://bugzilla.gnome.org/show_bug.cgi?id=624397

diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt
index dd0194fbfed4e3ae5842d1f9f4d1a74211ec5f20..bd96d42a0ffcb056b7c5f1b7990e03850973bd82 100644 (file)
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -458,7 +458,6 @@ gtk_bin_get_type
 <FILE>gtkbox</FILE>
 <TITLE>GtkBox</TITLE>
 GtkBox
-GtkBoxChild
 gtk_box_new
 gtk_box_pack_start
 gtk_box_pack_end

diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
index f481607b67356299f0917cbf74e759cca453822f..c372a1d149ea91b16e686548a330122552aa36db 100644 (file)
--- a/gtk/gtkbox.c
+++ b/gtk/gtkbox.c
@@ -115,6 +115,32 @@ struct _GtkBoxPriv
 
 typedef struct _GtkBoxDesiredSizes GtkBoxDesiredSizes;
 typedef struct _GtkBoxSpreading    GtkBoxSpreading;
+typedef struct _GtkBoxChild        GtkBoxChild;
+
+/*
+ * GtkBoxChild:
+ * @widget: the child widget, packed into the GtkBox.
+ * @padding: the number of extra pixels to put between this child and its
+ *  neighbors, set when packed, zero by default.
+ * @expand: flag indicates whether extra space should be given to this child.
+ *  Any extra space given to the parent GtkBox is divided up among all children
+ *  with this attribute set to %TRUE; set when packed, %TRUE by default.
+ * @fill: flag indicates whether any extra space given to this child due to its
+ *  @expand attribute being set is actually allocated to the child, rather than
+ *  being used as padding around the widget; set when packed, %TRUE by default.
+ * @pack: one of #GtkPackType indicating whether the child is packed with
+ *  reference to the start (top/left) or end (bottom/right) of the GtkBox.
+ */
+struct _GtkBoxChild
+{
+  GtkWidget *widget;
+
+  guint16    padding;
+
+  guint      expand : 1;
+  guint      fill   : 1;
+  guint      pack   : 1;
+};
 
 struct _GtkBoxDesiredSizes
 {

diff --git a/gtk/gtkbox.h b/gtk/gtkbox.h
index 568138766b688dabf01a5d7d93a0a31daa398b43..0a17af2e2b19fc26229ea76b3149cd817b18daa6 100644 (file)
--- a/gtk/gtkbox.h
+++ b/gtk/gtkbox.h
@@ -63,40 +63,6 @@ struct _GtkBoxClass
   GtkContainerClass parent_class;
 };
 
-/**
- * GtkBoxChild:
- * @widget: the child widget, packed into the GtkBox.
- * @padding: the number of extra pixels to put between this child and its
- *  neighbors, set when packed, zero by default.
- * @expand: flag indicates whether extra space should be given to this child.
- *  Any extra space given to the parent GtkBox is divided up among all children
- *  with this attribute set to %TRUE; set when packed, %TRUE by default.
- * @fill: flag indicates whether any extra space given to this child due to its
- *  @expand attribute being set is actually allocated to the child, rather than
- *  being used as padding around the widget; set when packed, %TRUE by default.
- * @pack: one of #GtkPackType indicating whether the child is packed with
- *  reference to the start (top/left) or end (bottom/right) of the GtkBox.
- *
- * The #GtkBoxChild holds a child widget of #GtkBox and describes how the child
- * is to be packed into the #GtkBox. All fields of this #GtkBoxChild should be
- * considered read-only and they should never be set directly by an application.
- * Use gtk_box_query_child_packing() and gtk_box_set_child_packing() to query
- * and set the #GtkBoxChild.padding, #GtkBoxChild.expand, #GtkBoxChild.fill and
- * #GtkBoxChild.pack fields.
- *
- * Deprecated: 2.22: Use gtk_container_get_children() instead.
- */
-#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
-typedef struct _GtkBoxChild   GtkBoxChild;
-struct _GtkBoxChild
-{
-  GtkWidget *widget;
-  guint16 padding;
-  guint expand : 1;
-  guint fill : 1;
-  guint pack : 1;
-};
-#endif
 
 GType       gtk_box_get_type            (void) G_GNUC_CONST;
 GtkWidget*  gtk_box_new                 (GtkOrientation  orientation,